From 4bd29a42296a69bd748203f0a8ac650fd18427ab Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 9 Oct 2008 16:26:35 +0000 Subject: [PATCH] =?utf8?q?Bug=20555573=20=E2=80=93=20gtk=5Ffont=5Fselectio?= =?utf8?q?n=5Fset=5Ffont=5Fname=20shouldn't=20require=20a=20screen?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * gtk/gtkfontsel.c (gtk_font_selection_set_font_name): Don't warn if there is no screen, just return FALSE svn path=/trunk/; revision=21621 --- ChangeLog | 8 ++++++++ gtk/gtkfontsel.c | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8718708bce..e68b197067 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-10-09 Christian Dywan + + Bug 555573 – gtk_font_selection_set_font_name + shouldn't require a screen + + * gtk/gtkfontsel.c (gtk_font_selection_set_font_name): + Don't warn if there is no screen, just return FALSE + 2008-10-09 Christian Dywan Bug 555523 – gtk_scale_button_set_adjustment should accept NULL diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index c931d2b9d6..d9d4766dba 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -1350,8 +1350,10 @@ gtk_font_selection_set_font_name (GtkFontSelection *fontsel, const gchar *new_family_name; g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), FALSE); - g_return_val_if_fail (gtk_widget_has_screen (GTK_WIDGET (fontsel)), FALSE); - + + if (!gtk_widget_has_screen (GTK_WIDGET (fontsel))) + return FALSE; + new_desc = pango_font_description_from_string (fontname); new_family_name = pango_font_description_get_family (new_desc); -- 2.30.2